--- old.txt	2025-01-31 15:09:18.545402211 -0500
+++ new.txt	2025-01-31 15:10:31.175767184 -0500
@@ -1,24 +1,25 @@
-	public static IBinding[] resolve(
+	static IBinding[] resolve(
 		final IJavaElement[] elements,
 		int apiLevel,
-		Map compilerOptions,
+		Map<String,String> compilerOptions,
 		IJavaProject javaProject,
 		WorkingCopyOwner owner,
 		int flags,
+		ICompilationUnitResolver unitResolver,
 		IProgressMonitor monitor) {
 
 		final int length = elements.length;
-		final HashMap sourceElementPositions = new HashMap(); // a map from ICompilationUnit to int[] (positions in elements)
+		final HashMap<IJavaElement, IntArrayList> sourceElementPositions = new HashMap<>(); // a map from ICompilationUnit to int[] (positions in elements)
 		int cuNumber = 0;
 		final HashtableOfObjectToInt binaryElementPositions = new HashtableOfObjectToInt(); // a map from String (binding key) to int (position in elements)
 		for (int i = 0; i < length; i++) {
 			IJavaElement element = elements[i];
 			if (!(element instanceof SourceRefElement))
 				throw new IllegalStateException(element + " is not part of a compilation unit or class file"); //$NON-NLS-1$
-			Object cu = element.getAncestor(IJavaElement.COMPILATION_UNIT);
+			IJavaElement cu = element.getAncestor(IJavaElement.COMPILATION_UNIT);
 			if (cu != null) {
 				// source member
-				IntArrayList intList = (IntArrayList) sourceElementPositions.get(cu);
+				IntArrayList intList = sourceElementPositions.get(cu);
 				if (intList == null) {
 					sourceElementPositions.put(cu, intList = new IntArrayList());
 					cuNumber++;
@@ -56,7 +57,7 @@
 			@Override
 			public void acceptAST(ICompilationUnit source, CompilationUnit ast) {
 				// TODO (jerome) optimize to visit the AST only once
-				IntArrayList intList = (IntArrayList) sourceElementPositions.get(source);
+				IntArrayList intList = sourceElementPositions.get(source);
 				for (int i = 0; i < intList.length; i++) {
 					final int index = intList.list[i];
 					SourceRefElement element = (SourceRefElement) elements[index];
@@ -76,6 +77,6 @@
 			}
 		}
 		Requestor requestor = new Requestor();
-		resolve(cus, bindingKeys, requestor, apiLevel, compilerOptions, javaProject, owner, flags, monitor);
+		unitResolver.resolve(cus, bindingKeys, requestor, apiLevel, compilerOptions, javaProject, owner, flags, monitor);
 		return requestor.bindings;
 	}